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

Change-Id: Ib05ead915b0e84cef8d837c02d9e7ed04a57fa31