Merge "Correctly support restoring SIM specific settings"