am 500862b4: am 1808f214: Merge "Fix issue #5636525: ANR observed in setup...
am 500862b4: am 1808f214: Merge "Fix issue #5636525: ANR observed in setup wizard after changing language" into ics-mr1
* commit '500862b4':
Fix issue #5636525: ANR observed in setup wizard after changing language