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

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