Merge "Update frame rate category changing logic" into main