Merge "[Settings] Unable to display disabled SIM (part 2)"