Merge "Suspend window deletion while rendering" into devel/master