Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
am: dbd60cd6ee

Change-Id: I5b6ff8bb9913fb43386c51fd47ae5e80e76541f2