Merge "Ensure notif-based bubbles don't occur once and for all!! & improve logging" into qt-dev
am: 6494b52f39

Change-Id: I4bb62d53512fd115be4b5b4facc5bc07809b4aed