Merge "Use default thumbnail if getting app thumbnail fails"