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

Change-Id: I6bba16509dac42ac372d28da546de36eb24969cf