Merge "Fix race condition in PM snapshots"