Merge "Do not recreate taskbar due to unestimated bounds" into main