Merge "Extend AnrController to improve ANR dialog controls" into sc-dev