Merge changes Ib260521d,I1363277c into main

* changes:
  Migrate LayerTest to LayerSnapshotTests
  Remove legacy snapshot updates