Merge "Fix unexpected IME visibility restores" into sc-dev