Merge "Add more details to broadcastIntent trace events." into main