Merge "APIs for HDR output control"