Merge "Fix history preference page field editor layout"