Merge "Animate color change of mode activation/deactivation" into main