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

* commit 'c51b1d0e22e63fe3298cf79327096478aec49ace':
  Disallow creating shortcut for directory contacts