Merge "Update values for the frame rate category constants" into main