Merge "More subtle sparkle animation" into sc-dev