Merge "Fix IME visibility after lock screen" into rvc-dev