Merge "Fix Assistant breaks after stopping the app." into tm-dev