Merge "Remove the bubble if the notification is no longer FLAG_BUBBLE" into qt-dev
am: 19fd800795

Change-Id: I62c25c9e081a4d654f8954d267d7022062ffbd22