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

Change-Id: I7a2d2ddaccaf099bb6a81c4129b8e03ed3d021e1