Merge "The activity should also be finished when the alert dialog is closed"