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

Change-Id: I5b4c5b5eb05b9198e92b9aa4788a22faaf2e6b3b