am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev

* commit 'd2975f9d0c12b46978c2a108961617293eeaba85':
  Fix crashes in Settings