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

Change-Id: Ideabb3e689c30a60fd08b7928151f0f1d76f15d2