Merge "Text insertion cursor is now defined by a Drawable."