Merge "Revert "Added trace event to broadcastIntentWithFeature."" into main