Merge "Fix color option update animation" into main