Merge "The activity should not be left when the dialog disappears"
am: 200041bf7a

Change-Id: Iac9822f99309c7d0f77c1c1567eb06299f248f47