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