am 3cd96129: Merge "Fix ime swtich issue" into jb-mr1-dev

* commit '3cd961292e877cc5fac146290421e9e67aa553a2':
  Fix ime swtich issue