Merge "Setting NumPadAnimator only if background is RippleDrawable" into sc-dev