Merge "Call ColorDisplayManager for Extra Dim/RBC state" into sc-dev