Merge "Fix NPE in RippleDrawable" into lmp-dev