Merge "Fix bug 5087980 - MenuItem#expandActionView should work from within onCreateOptionsMenu"