Merge "API: add smooth switch in setFrameRateCategory" into main