Merge "Add Battery Information page" into udc-qpr-dev