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

This reverts commit 9f41c6ea.

This will make setup pages respond accordingly to armed state
transitions. This will also allow the settings on a page to at least be
visible while they are disabled.