Merge "Fix battery percentage is inconsistent in settings" into udc-dev