Merge "Adjust total consumed power to avoid double-counting" into sc-dev