Merge "Reset the window drawn state if drag resizing changed" into udc-qpr-dev