Merge "HDR video fix" into sc-dev