Merge "Do not create EMPTY batterystats history file." into qt-dev