Merge "Add missing <functional> includes for std::function" into main