Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev