Merge "Fix app crash on deep shortcut restore" into ub-launcher3-qt-future-dev
am: 4498241117

Change-Id: I10f1077df8f89c96f7ad3f35f333787568d238cd