Merge "Add COLOR_FIDELITY flag" into udc-qpr-dev