Fix flickering scope UI when inside optic

... and adjusting zeroing at the same time.
Merge branch 'master' into scope-flickerfix
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM
Merge remote-tracking branch 'origin/master'