Merge "Fix CPU attribution when power stats collection is disabled" into main