Merge changes I93d4d089,I4f09f9e5 into tm-qpr-dev

* changes:
  Fix b/248686898: Battery Usage list renders items on top of each other after swiping back from an app
  Fix broken battery usage Robolectric tests