Merge "Prevent extraneous saving of pinned snap fraction." into pi-dev