Merge "Have RippleDrawable ignore non-attached RenderNodes" into sc-dev