Merge "Refactor LogBuffer to no longer use threads/locks" into main