Merge "Prevent PreRebootLogger blocking shutdown thread" into rvc-dev