Merge "Do not hold lock when trying to get snapshot" into qt-dev