Merge "Introduce FLAG_BUBBLE & mark notifs allowed to bubble with it"