Merge "Crash in PreferredSimDialogFragment"