Merge "Don't allow newly writable contact splits" into mnc-dev