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

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