Improve battery meter support (thanks to Richard W.) Closes #3063541.

2 files changed