Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2