Merge "cputimeinstate: add missing <functional> include" into main