Merge "Force write battery stats after a --history-since." into lmp-preview-dev