Merge "Add DISPLAY_BT2020 dataspace" into main