Merge "Save one notifyColorListeners() call" into sc-dev