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

* commit '500862b44c8ecbb867144781239bd55b6d3c9489':
  Fix issue #5636525: ANR observed in setup wizard after changing language