Merge "Fix RippleDrawable exit animation"