Resolve #3526907 Client auto-save conflicts

Ted Bowmanrequested to merge
issue/experience_builder-3526907:3526907-client-conflict into 0.x

Closes #3526907

Merge request reports