Merge changes I4f72448f,I74b7233c into nyc-dev

* changes:
  Fix ripple positioning within scrolled node
  Clip projected ripples to outlines