Merge "Clear dns cache when restoring network access" into main