Merge "Allow for the different nav bars before the device is provisioned Split...

Merge "Allow for the different nav bars before the device is provisioned Split window creation from content creation so I could remove and add new content once the provisioned state changed." into pi-dev
am: 1fe1ef0d

Change-Id: I4595133eef28d81622f35bdcb4fd0a814acb4a41