Merge "Get Extra Dim availability through ColorDisplayManager" into sc-dev