Merge "Remove the old battery page" into pi-dev