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