Merge "Fix crashes in Settings" into mnc-dr-dev