Merge "Be more consistent with Q when the tabs feature flag is disabled."