Merge "Add flag for setFrameRate API" into main