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

Change-Id: Iee447e3103ac3d74f2cc3b0209d22965575ae444