Merge "Fix bug 3330223 - onCreateOptionsMenu() unable to getActionView() immediately after orientation change" into honeycomb