Merge "Allow color mode to be NOT_SET" into tm-qpr-dev