Merge "Track notification clicked events in UsageStats"