Merge "Add more tests for battery checker code" into qt-qpr1-dev