Merge "libsnapshot: remove temporary solution" into main