Merge "Revert "SF: enable frame rate override ""