Merge "WifiInfo: Add isPrimary to indicate the primary connection" into sc-dev