Merge "Keep selection handles in edit fields."