Merge "Support logging more usage event types." into main