Merge "Refactoring canSuspendPackage to support batch queries"