Merge "Delay removal of windows from WindowManager"