Merge "Fix the overscroll placement/composition logic" into main