Merge "Apply VectorDrawable color filter at draw time" into lmp-dev