Merge "Properly parcel HdrCapabilities." into nyc-dev