Merge "UsageStats: Avoid holding main lock when notifying callbacks" into main