Merge "Add VSR annotation for readback of extended range layers" into main