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

Change-Id: Ie262b8b5b869df1116902175e98ce102b5b92d94