Merge "Modify scrollbar to include gap between thumb and track" into main