Merge "Limit the ServiceFriendlyNames and limit the number of Passpoint per App" into sc-dev