Merge "Run per procstate CPU time-in-state tracking on the main thread"