Merge "Softens one of the battery strings per UI request" into pi-dev