Merge "Fix IME Keyguard exit animation" into oc-dev