Merged in strangeways/main/trac-17174 (pull request #264)

Rework tray icon blinking

Approved-by: Eion Robb
Approved-by: Gary Kramlich