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

* commit '1a3c051bcc787363d9154da4a8e8e562dda32926':
  Hide/show ime switch icon properly