Merge "SF: Flag guard setFrameRate() API"