Merge "Do not animate sparkles when animations are off" into sc-dev