Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev