Merge changes Id157edb7,I94b05bf1 into sc-dev

* changes:
  Ripple size and easing
  Make sparkle area larger