Merge "Manage DropBoxManager using sp<>"