Merge "Fix IME tile related crash" into jb-mr1-dev