Merge "Update battery list item string" into tm-qpr-dev