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

* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
  Prevent cases of bogus action bar measurement.