Merge "End Taskbar animator before other cleanup" into sc-dev