Merge "Clear composition changes when a color mode is not supported" into sc-dev