Merge "Allow showing tabs while in subpages" into pi-car-dev am: 535364d1d9 am: 1f04b55b8b am: c87f697238 am: 061a87c154

Change-Id: I21de1c8504a7905a59f6b08719408fe72039e58e