Merge "Hide HdrCapabilities constructor." into nyc-dev