Merge "Fix IME Keyguard exit animation" into oc-dev
am: b4566b30fc

Change-Id: Ia857135f520ca1633f1ca4d53379ca7135c217b4