Merge "Modify usagestats event processing thread" into main