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

Change-Id: I0b722d0dabda77b8d1deaed41bd9a23a283f7ccd