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