Merge "Separate ripple animation logic, remove RevealDrawable"