Merge changes I2f5c4d68,I65d5bd14 into main

* changes:
  [legacy sf flag] - Remove legacy methods for front end
  [legacy sf flag] - Remove layerLifecycleManagerEnabled