[Backport to 3.38] notificationDaemon: Fix icon-choosing logic

'image-data' (or 'image-path') should take precedence over 'app-icon', even when both are sent by the application (e.g. Google Chrome).

Fixes #3616 (closed).

Part-of: !1616 (merged)

(cherry picked from commit 779e66ae)