Merge "Fix problems with IME layers." into jb-mr1-dev