Merge "Add non-app power consumers to the PowerStatsViewer"