Merge branch '30063-builds-sidebar-stutter' into 'master'

Add subnav height to sidebar scroll calculation

Closes #30063

See merge request !10262

app/assets/javascripts/right_sidebar.js

@@ -209,7 +209,7 @@ import Cookies from 'js-cookie';
     };
     Sidebar.prototype.setSidebarHeight = function() {
-      const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight();
+      const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight() + $('.sub-nav-scroll').outerHeight();
       const $rightSidebar = $('.js-right-sidebar');
       const diff = $navHeight - $(window).scrollTop();
       if (diff > 0) {