Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev