Merge "    Tentertively enable notification ime switcher" into jb-mr1-dev