Merge "Adjust layout padding for SlicePreference"