Frame rate switching persistant

Early 2021 clean-up: duplicate