Merge remote-tracking branch 'upstream/dev' into dev

scripts/wk/hw/diags.py

@@ -121,8 +121,7 @@ class State():
           test.set_status('Aborted')
 
     # Cleanup panes
-    self.ui.remove_all_info_panes()
-    self.ui.remove_all_worker_panes()
+    self.reset_layout()
 
   def disk_safety_checks(self) -> None:
     """Check for mid-run SMART failures and failed test(s)."""
@@ -220,6 +219,12 @@ class State():
           test_group.test_objects.append(test_obj)
         self.test_groups.append(test_group)
 
+  def reset_layout(self) -> None:
+    """Reset layout to avoid flickering."""
+    self.ui.clear_current_pane_height()
+    self.ui.remove_all_info_panes()
+    self.ui.remove_all_worker_panes()
+
   def save_debug_reports(self) -> None:
     """Save debug reports to disk."""
     LOG.info('Saving debug reports')
@@ -898,6 +903,7 @@ def run_diags(state, menu, quick_mode=False, test_mode=False) -> None:
       aborted = True
       state.abort_testing()
       state.update_progress_file()
+      state.reset_layout()
       break
     else:
       # Run safety checks after disk tests