Merge "Catch error thrown by WindowManager if window has already been detached" into tm-qpr-dev