Bug 998175 - Properly handle concurrent file transfers

@ian-liu sendFileViaHandover is tested here already