Merge "Improve backspace for emoji and variation sequences." into nyc-dev