Merge "Add composite string for battery summary in settings" into pi-dev