Merge "Add color option icon morphing animation (2/2)" into main