Merge pull request #11843 from jonmahoney15/watt-hours-consumed-osd-element