Merge "Wire display context for text toasts" into tm-dev