Merge \"Add support for launcher shortcuts.\" into ub-launcher3-calgary
am: ec1b1c542c

Change-Id: I1993ee5db57bdb300430ef5b106c4c95d6f50a0c