Merge "Deferring cross-profile animation after the dialog"