Merge "Do not create extend surface for transfer starting window change." into tm-qpr-dev