Merge "Fix round scrollbar test" into main