Merge "[Settings] Workaround for network and internet crash"