Merge "Flag the HDR animation change" into main