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

Change-Id: I01877ec034f12a99df3bc0db25914b2ae23b59af