Merge "RESTRICT AUTOMERGE Support split-mode on Note Shortcut" into udc-dev