Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev

native/jni/src/terminal_attributes.h

@@ -57,7 +57,6 @@ class TerminalAttributes {
                 outWord[i] = (uint16_t)codePoint;
             }
             *outFreq = BinaryFormat::getAttributeFrequencyFromFlags(shortcutFlags);
-            mPos += BinaryFormat::CHARACTER_ARRAY_TERMINATOR_SIZE;
             return i;
         }
     };