Merge "Fix icon color animator" into tm-dev