Merge "Make Mtp FFS allocations per session rather than per file"