Merge "Keep starting window on top during remove."