Merge "Fix network callback with the same PendingIntent does not release" into sc-dev