Merge "Ensure the notification is removed when bubble is removed & fix cancel...
Merge "Ensure the notification is removed when bubble is removed & fix cancel all" into qt-dev am: 8496f4ee
am: 808091a2
Change-Id: I1b14d3f7a23aec3d8e883a6209567482ed6daed5