Merge "Unable to enable the removable esim" into tm-dev