Merge "Fixing prediction ring color not getting updated if the icon changes while the slot animation is running" into main