Merge "Fix battery controller non-fire bug" into lmp-preview-dev