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

Change-Id: Iee1b3aa9e628005eb6b15fa72bfe5e03c00056a9