Merge "Revert "Update SF to use createHintSessionWithConfig"" into main