Merge "Update ripple according to UX feedback."