Merge "Improve forward delete key handling." into nyc-dev