Merge "Make QS always use dark theme colors" into sc-dev