Merge "Add a user preference for split layout within Appearance & Layouts"