Merge "Ensure that the IME switcher button is always touchable" into qt-dev am: f106e0a8fa
am: 19f7142be6

Change-Id: I804848a154d6bf7ea7cc3b75d1103b313b6d188a