Merge "Retain the ANR report on choosing wait/feedback in the ANR dialog"