Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2