Merge "Do not associate staring window to task for rotation change" into udc-qpr-dev