Merge "Revert^2 "[legacy sf flag] - Remove legacyFrontEndEnabled"" into main