Merge "ShortcutManager javadoc" into nyc-mr1-dev