Merge "Fix BubbleExtractor not looking up activity info in a user-based way" into main