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