Merge "Fix the startingWindow may clipped during AR#transferStartingWindow" into tm-dev