Merge "Fixed an issue where the keyguard statusbar could be showing" into pi-dev am: 693a915de8
am: 69903749e2

Change-Id: If26b9b52011d8130a79bf97cf6d69e62f90f254e