Merge "Prevent re-entry when clearing animating hotspots" into lmp-dev