Merge "Fixed keyguard inflation problem" into oc-mr1-dev am: 3163ba7458
am: 8584468862

Change-Id: I57474e7da639afb306b98fe75f462d6d5d72c332