Merge "Revert "[sf] enable new sf frontend"" into main