Merge "powerstats: native energy meter returning incorrect duration" into sc-dev