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

diff --combined app/assets/stylesheets/common.scss
index dcbf00be85d4f86ccf00ed11c5bf20caca2a39ab,535b7e4b8a09dec3b80c083414c9257eba50ce87..40392cdae5362963ce5f8fb96e1e84b7f09ade6e
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -2,6 -2,34 +2,34 @@@
  @import "bootstrap";
  @import "rails_bootstrap_forms";
  
+ /* Bootstrap + r2 fixes */
+ 
+ :root[dir=rtl] {
+   .bs-tooltip-auto[data-popper-placement^="right"] .tooltip-arrow {
+     /* no-r2 */
+     right: unset !important;
+     left: calc(-1 * var(--bs-tooltip-arrow-height)) !important;
+ 
+     &::before {
+       /* no-r2 */
+       left: unset !important;
+       right: -1px !important;
+     }
+   }
+ 
+   .bs-tooltip-auto[data-popper-placement^="left"] .tooltip-arrow {
+     /* no-r2 */
+     left: unset !important;
+     right: calc(-1 * var(--bs-tooltip-arrow-height)) !important;
+ 
+     &::before {
+       /* no-r2 */
+       right: unset !important;
+       left: -1px !important;
+     }
+   }
+ }
+ 
  /* Styles common to large and small screens */
  
  /* Default rules for the body of every page */
@@@ -976,7 -1004,7 +1004,7 @@@ tr.turn:hover 
      background: $offwhite;
    }
  
 -  .inbox-row-unread {
 +  .inbox-row-unread td {
      background: #CBEEA7;
    }
  }