base

Merge "Fix a bug where surface crashes when the enter animation starts while the exit a...