Merge "Add animate HDR/SDR downwards support" into main