Merge "Update the javadoc for FrameRateCategory constants" into main