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