Merge "VRR: Change both frame rate and category" into main