Merge "Convert BubblesManager to use CommonNotifCollection."