OP-1156 cleaned up updateAutoPilotVtol() function