Merge "Secondary split screen app will be next to the navigation bar (2/2)" into ub-launcher3-edmonton