Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev