Merge "Fix missed use of old int version code in shortcut manager."