Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev