Merge "Applications with broken resources get default icon" into honeycomb-mr1