Merge "Clean up LayoutPreference"