Merge "Use spy windows to resize tasks" into udc-qpr-dev