Merge changes I9dc1de92,I254138ca into sc-dev

* changes:
  Slow down sparkles and make them more sparse
  Fix issue where ripple would move