Merge "Save config to disk to avoid binding." into mnc-dev