Merge "Disable battery saver tron log by default" into pi-dev