Arch: Add a pref option to disable auto wall-merge