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