Merge "Don't crash if an application has an invalid icon"