Merge "Correct exit animation window retention logic."