Merge "Revert "decouple Bubble from NotificationEntry"" into rvc-dev