Merge "Delete CR LF at the same time with one backspace key." into nyc-dev