Merge "Fix NPE in getShortcutIconDrawable" into main