Merge "Add smooth switch bool for setFrameRateCategory" into main