Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev