Merge "Add dividers on a few preferences"