Merge "Fix overscroll detection on watch." into main