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

Change-Id: I4e19596335207ff6278294aa0e9c2bdbb5f80860