Merge "Base color API updates" into tm-qpr-dev