Merge changes I80bebcd0,I35f3718f into qt-dev

* changes:
  Simplification of code to prevent a Log.wtf in expected cases.
  Suppress the wtf log for notifications that are expected