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

Change-Id: I8be079104b58e9f76de9bb199020def0c23ab804