Reorder systray. Closes #2919.
Merge remote-tracking branch 'ivan/feature/2919_reorder-systray' into develop