Merge commit '343158c797ea12f3f43df2a0ec70c65ada9e6daa' * commit '343158c797ea12f3f43df2a0ec70c65ada9e6daa': Some improvements to the battery usage UI:
Merge commit '343158c797ea12f3f43df2a0ec70c65ada9e6daa' * commit '343158c797ea12f3f43df2a0ec70c65ada9e6daa': Some improvements to the battery usage UI: