Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2