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

Change-Id: I64a786967d2c324acb19d4afee3ae089ce93f6e0