Merge "Correctly support restoring SIM specific settings" into main