Merge "Check DeviceOwner exists before using packageName"