Fix tests for modified dialogs.

Change-Id: I33495b5c851966f5b21b350e93f1ce567caa574e
Merge topic 'view-settings' into next

4b4d7b23 Fix tests for modified dialogs.