Merge "Fix SettingsProto corruption" into qt-dev