Merge "[PB] Fix windowless window could be remove too early" into main