Merge "Major update to HoneycombGallery" into honeycomb