Merge "Remove DropBoxManager::getNextEntry"