Merge "Attempt to fix AssistantStackTests presubmit flakiness" into tm-dev