Merge "Fix system service power calculation when measured energy is available" into sc-dev