Merge "Remove taskbar window from WindowManager in TaskbarManager.destroy()" into main