Merge "Misc fix on network & internet screen for developer preview"