Merge "Adding null check before accessing shortcut extras" into ub-launcher3-qt-dev
am: b030e5162c

Change-Id: I21463733b254fe2e05d5324288900c341e51b93a