Merge "Fix null PendingIntent in network listens" into sc-dev