Merge "Revert "Advertise support for BT709 in the WSI"" into tm-dev