Merge "Disallow creating shortcut for directory contacts" into jb-dev