am df82ad9f: am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb

* commit 'df82ad9fb239572f3076ffc8894697b9de3d18d1':
  Fix 3381324: Restart ripples when the user moves away from the edge.