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

Change-Id: If7ae622824fed84e56088bc92c5d01f7a4401983