Merge changes I20a34528,Id2272981 into main

* changes:
  [sf] Use a unique sequence number when tracking layers in planner
  [sf-newfe] Fix snapshot paths for recursive mirror paths