Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev