Merge "Add tracking for widget creation"