Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev