This reverts commit 0507fb9b.

Adding missing qgcView to QGCMapPolygonVisuals instance in SurveyMapVisual.qml

Since disconnectAll will kill this controller before it gets to next
statement

PX4 setup: Put sensors before radio to create the right affordance: We want the user to handle this first

Fix merge issues