Merge "Attribute procstate cpu times to correct battery/screen on/off buckets."