Merge "Fix flicker after unlocking when IME was showing" into main