Merge "Update settings main page battery string" into pi-dev