Merge "Multiple display lists for editable text"