Merge "Update battery icon for incompatible charging" into udc-qpr-dev