am 852b589a: am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1

* commit '852b589a51531f8f7a166f36f7596c255896f35c':
  Hide/show ime switch icon properly