Merge branch...

Merge branch 'preserve-scroll-for-refresh-in-certain-situations-in-cheat-slave' into 'pregmod-master'

preserve scroll for refresh in certain situations in cheat slave

Closes #3118

See merge request pregmodfan/fc-pregmod!9515