Merge "Handle interaction between minimal post processing and HDR output control" into udc-dev