Add custom tray and window button behavior.
Merge remote-tracking branch 'remotes/hexf/master'