Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2