Merge "Fix crash in setup wizard" into mnc-dev