Merge "Add storage for snapshots in KeySyncTask"