Merge "TC: Fix null PendingIntent being passed to RemoteAction" into pi-dev