Merge "Fix InterruptException in ShortcutService." into sc-dev