Merge "Update battery saver string" into pi-dev