Merge "Fix ime swtich issue" into jb-mr1-dev