Merge remote-tracking branch 'upstream/pull/5765'

diff --combined app/assets/stylesheets/common.scss
index 3ba484cd5c10745a407f30920ded6f222ff475a6,0f4c0a5ef8d290b5498ad174e8518a07159252e3..27d58f84ea3e963025b531ee2d9c12b061ce3513
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -351,7 -351,6 +351,7 @@@ body.small-nav 
        display: block;
      }
  
 +    .sidebar-close-controls,
      #sidebar_loader,
      #sidebar_content {
        display: none;
@@@ -598,6 -597,8 +598,8 @@@ tr.turn 
  }
  
  .routing_marker_column {
+   margin-left: .35rem;
+   margin-right: .35rem;
    width: 15px;
  
    img {
@@@ -989,7 -990,3 +991,7 @@@ img.trace_image 
      }
    }
  }
 +
 +.heatmap-wrapper {
 +  height: 130px;
 +}