Merge "[PIP2] Fix enter/exit animator" into main