Merge "Fixes NPE with system shortcuts." into ub-launcher3-rvc-dev