Merge "Fix a bug with IME blinking just after leaving the lock screen"