Merge "Make ANR dialog settings visible to tests"