Merge "ColorDisplayServiceTest - stop animation on tearDown" into main