Merge "Fix resetting FPS when switching to standard mode"