Merge "Add logic to re-raise ANR dialogs if the user taps wait."