Merge "Cleaning up widget resizing code" into honeycomb-mr1