Merge "Don't clear mExiting if window is going to be removed."