Merge "Don't show layout with default if in tabbed view" into rvc-dev am: ff779f6d8e am: eee917a2e4 am: b9d7abaf42 am: 5395a26024

Change-Id: I3fc92d2afd881f1b533ec41758743933bb64eb09