Merge "Reduce amount of unnecessary RippleDrawable mask redraw" into mnc-dev