am 483deed6: am 2321e1dc: am 052ad242: b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '483deed6'
* commit '483deed6':
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.