Merge "Use FLAG_UPDATE_CURRENT for TC PendingIntents." into pi-dev