Merge "Fixing crash when using multi-window" into udc-qpr-dev