Merge "Don't show layout with default if in tabbed view" into rvc-dev am:...
Merge "Don't show layout with default if in tabbed view" into rvc-dev am: ff779f6d am: eee917a2 am: b9d7abaf am: 5395a260
Change-Id: I3fc92d2afd881f1b533ec41758743933bb64eb09