Merge "Only force drawing in RippleDrawable when necessary" into lmp-dev