Merge "Reuse the active esim slot" into tm-dev