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