Merge "Fix dead key -> space combination." into jb-mr2-dev