Merge "Hide/show ime switch icon properly" into ics-mr1