Merge "Avoid showing "0 minute" in the charge time label" into udc-dev