Merge "decouple Bubble from NotificationEntry" into rvc-dev