Merge "Fix watchdog timeout during recomputeComponentVisibility" into main