Merge "Fix taskbar crash after cleanup" into sc-dev