Merge "libsnapshot: Increase the size of scratch to 2MB" into main