Merge "mtp: add <assert.h> and <functional> includes" into main