Merge "Fix height of keyguard status bar" into pi-dev