Merge "Added trace event to broadcastIntentWithFeature." into main