Merge "[VRR] Change the velocity-to-frame rate mapping" into main