Merge "VRR flag to support velocity mapping" into main