am 29a43dd6: Merge "Speed up shortcut launch performance" into jb-dev

* commit '29a43dd6cc87b1d5871f3fdb3e5247059076fba1':
  Speed up shortcut launch performance