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