Copy changes from dev-branch into main

History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.

ApplicationLibCode/UserInterface/RiuQwtPlotCurveDefines.cpp

@@ -67,6 +67,13 @@ int RiuQwtPlotCurveDefines::zDepthForIndex( ZIndex index )
         case RiuQwtPlotCurveDefines::ZIndex::Z_SINGLE_CURVE_OBSERVED:
             return 500;
             break;
+        case RiuQwtPlotCurveDefines::ZIndex::Z_PLOT_RECT_ANNOTATION:
+            return 600;
+            break;
+        case RiuQwtPlotCurveDefines::ZIndex::Z_REGRESSION_CURVE:
+            return 700;
+            break;
+
         default:
             break;
     }