Merge "Updated dialog and toast assets." into honeycomb