Avoid showing the keep changes/overwrite dialogs when unnecessary. For #6525 and the issue mentioned in #5614.
Code review changes
Merge pull request #6694 from adobe/nj/issue-6525

Avoid showing the keep changes/overwrite dialogs when unnecessary (for #6525)