Merge branch 'backspace-out-of-empty-textblock'