Merge "DropBoxManager: Fix doc build error" into sc-dev