Merge "Cutout: Fix status bar layout" into pi-dev