Merge "Fix some IME transition issues" into sc-dev