Merge "Make overview color tinting work properly." into sc-dev