Merge "Clean up log initialization" into main