Merge "Clear ripple animations on cancel/end" into lmp-dev