Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev