Merge "Fix issues in battery usage accounting" into qt-dev