Merge "Feature flag for moving HDR related logic to separate modifier" into main