Merge "Add sysprop to control HDR headroom" into udc-dev