Merge "HolePunchPIP: Do not use hole punch for HDR videos" into sc-dev