Merge "Show warning log when ShortcutInfo is re-published" into oc-dev