Merge "update setCategories javadoc to include info of its usage in sharing shortcuts"