Merge changes from topic 'display-p3'

* changes:
  Add Display P3 DATASPACE enums
  Remove TODO