Workspace: Change state animation cleanup

Change-Id: I7703deed7c652ae562df819f6e6ba3d6b941d3a4