Merge "Fix crash on AppInfo screen"