Merge "Fix snapshots for dialogs" into oc-dr1-dev