FlyViewVideo.qml, OnScreenGimbalController.qml: fix conflict with tracking feature after rebase

src/FlightDisplay/FlyViewVideo.qml

@@ -89,10 +89,11 @@ Item {
     }
 
     OnScreenGimbalController {
-        id:                 onScreenGimbalController
+        id:                      onScreenGimbalController
-        anchors.fill:       parent
+        anchors.fill:            parent
-        screenX:            flyViewVideoMouseArea.mouseX
+        screenX:                 flyViewVideoMouseArea.mouseX
-        screenY:            flyViewVideoMouseArea.mouseY
+        screenY:                 flyViewVideoMouseArea.mouseY
+        cameraTrackingEnabled:   videoStreaming._camera && videoStreaming._camera.trackingEnabled
     }
 
     MouseArea {

src/FlightDisplay/OnScreenGimbalController.qml

@@ -29,7 +29,8 @@ Item {
     property var  activeGimbal:                 gimbalController ? gimbalController.activeGimbal : undefined
     property bool gimbalAvailable:              activeGimbal != undefined
     property var  gimbalControllerSettings:     QGroundControl.settingsManager.gimbalControllerSettings
-    property bool shouldProcessClicks:          gimbalControllerSettings.EnableOnScreenControl.value && activeGimbal ? true : false
+    property bool cameraTrackingEnabled:        false // Used to ignore clicks when camera tracking operation is active, otherwise it would collide with these gimbal controls
+    property bool shouldProcessClicks:          gimbalControllerSettings.EnableOnScreenControl.value && activeGimbal && !cameraTrackingEnabled ? true : false
 
     function clickControl() {
         if (!shouldProcessClicks) {