Merge "The activity should not be left when the dialog disappears"