Merge "ADD NPE check before shortcut key creation." into ub-launcher3-rvc-dev