Fix login and systray state
Merge branch 'master' into builds
7.671