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

* commit 'd9774c9f5b4b5e0c51c03795cdc1658d1388ec87':
  Fix crashes in Settings