Move systray to main monitor
Enable rebase on hg