Merge "Fix rare NPE in DropBoxManagerService"