Merge "Fix background color (again)" into sc-dev