Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev