Merge "The activity should also be finished when the alert dialog is closed" am: 0265893ccf am: 042f76ce2e
am: 6b56d2790e

Change-Id: Ie73f2f25b0ac6f9353b228aa65b0a8be6de0a7f1