Merge "Fix roaming getting stuck after changing sims"