Merge "Update ShortcutManager/Service javadoc/impl around sizing" into oc-dev