Merge "Log metrics for adding and removing widgets" into main