Merge "Revert "SF: Use strong pointers to Layer when moving snapshot""