Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev