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