Change state animation cleanup

Change-Id: I3c0ef9b6378c10b3e7d92643abd7ececc4431cb0