Merge "UsageStats: Attach the dedicated handler thread flag." into main