Merge "[Passpoint] Keeping the user settings for passpoint" into sc-dev