Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev