Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev