Merge "Animate changes between action icons." into 24D1-dev