Merge "Avoid recursive destruction from exit animation done" into tm-dev