Merge "End any running taskbar animation in cleanup()" into sc-dev