Merge "[Settings] Code refactor for SIM change detection"