Merge "Fix HDR detection" into sc-dev