Merge "Add a lock to protect persistent stats snapshot" into qt-dev