Merge "Added logic to reset assistant UIDs on audio crash" into tm-dev