Merge "Fixing alert dialog icon." into honeycomb