Merge "StatsManager uses private object for synchronizing"