Merge "Remove bang from not connected wifi" into mnc-dev