Merge "Always on the valid system default ime" into jb-dev