Merge "Fix deadlock by making DropBoxManager call async."