Merge "Reduce overdraw after clearing ripples in RippleDrawable" into lmp-dev