Merge "More widget tweaks" into honeycomb