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

Change-Id: I919a34c60181f4582992d4d7bf7838b66051b39d