Merge "Limit Display-P3 surface formats to 8888" into oc-mr1-dev