Merge "Improve handling of activity destroy during popup exit animation"