Merge "Remove backing fields for ColorAndMotionScreen" into main