Merge "Keep refresh rate settings upgraded even if the flag is off" into main