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

Change-Id: Ifb3aa5f765f47f6a7cdc76ac686d7133ed58d536