Merge "Add summary for battery manager preference" into pi-dev