Merge "Skip brightness ramp when HDR content appears/disappears" into main