Merge "Add default values to {Display,Layer}Settings fields"