Merge "Update App battery usage page and add tests." into tm-qpr-dev