Merge "Fix status bar app name/icon overlap" into main