Merge "Revert "Revert "Keep selection handles in edit fields."""