Merge "[Ongoing call] Fix chip clip when using activity launch animator" into main