Merge "[Settings] Code refactor for device without SIM"