Merge "Don't toggle scrollbar during predicitve back swipe to avoid flicker" into main