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

* commit '6d85d1686e6a333fe990d9e3ae5b978e8a8ce8c2':
  Fix crashes in Settings