Merge "Move the selection handles vertically to match TextView."