Merge "UsageStats: detach dedicated handler thread flag" into main