Merge "Add phenotype flag to disable battery saver tron log" into pi-dev