Merge "Prevent caching unexpected IME status while showing keyguard in split" into sc-dev