Merge "[Settings] Settings within each SIM not been displayed to the user" into sc-dev