Merge "Fix printing duplicate logs to save on battery" into tm-dev