Merge "Fix duplicate text in battery string" into pi-dev