Merge "Enhance the shortcut manager javadoc." into oc-dev