Merge "Ripple tint is now color" into lmp-preview-dev