Merge "Add ColorTransformController to AppWindowToken"