Merge "SF: Add LayerSnapshotGuard to manage layer snapshot"