Merge "Fixed battery tips card UI." into udc-qpr-dev