Merge "Remove legacy logger" into pi-dev