Fix systray issues
Remove copy paste
Merge branch 'master' into builds
7.665