Merge "Revert "Fix for Scroll Bar Visibility with RSB Scroll"" into main