Merge "Revert "[Settings] configuration for hidding SIM settings UI""