Merge "Use IBinder token for indexing toasts instead of ITransientNotification"