Merge "Thumbnail widget tweaks" into honeycomb