Merge "Fix color animation" into sc-dev