SL-18721 Viewer shutdown order changes

Same thing as commit cf692c40
which was removed due to shutdown freezes.
Error thread is no longer there so doesn't cause any race sonditions,
was not able to repro any issues so will ask QA to test shutdown