Merge "Revert the icon rotation animation."