Merge "Calculate current position for window animation leash" into main