Merge "[sf] recover when layer snapshot is null" into main