Merge "Still return a package suspsended dialog if there is no owner." into nyc-dev