Merge "Secondary split screen app will be next to the navigation bar (1/2)" into pi-dev