Merge "Fix ToggleableGlobalSettingsFlag on user builds" into ub-launcher3-master