Merge "Fix connected wifi entry not clearing when Wifi is disabled"