Merge "Don't add IME back and switcher buttons if IME renders them"