Merge "Improve battery tips cards." into udc-qpr-dev