Merge "Better fix for non-SDR brightness." into sc-dev