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

* commit 'cdcba9ce5f44cf4cad9e308919272db4e15e9717':
  Fix crashes in Settings