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

Change-Id: I0270ec6a44bb333a2216952de551181a6b650da0