Merge change I8c9748c8 into eclair-mr2

* changes:
  Input language switching. Bug: 2331173