Merge "Fix NPE crash in AppInfoBase"