Merge "Fix highlight animation"