Merge "init: clean up logging initialization"