Merge "notificationBroadcasts shouldn't be a StateFlow" into main