Merge "Revert "Fix roaming getting stuck after changing sims""