Merge "ColorSchemeTransition now updates the ripple color" into tm-dev