am 60dbc3c0: am e857632a: Merge "Dock: Renable desk-dock apps" into jb-dev

* commit '60dbc3c05c644ae057c4946f1229387e60be8cb3':
  Dock: Renable desk-dock apps