Merge "Fix null PendingIntent in network listens"