Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev