Forgive me monkeys, for I have sinned.

It has been several hours since my last commit.

Fix an obscure bug that could cause call ordering problems while
updating ListAdapter-based MenuPresenters. This would trigger an
inconsistent return value from the adapter's getCount method that
didn't take the expanded menu item into account, resulting in the
infamous ListView "you didn't call notifyDataSetChanged" exception.

Bug 6412318

Change-Id: I6262846d9c2acdb87ff99116ad78ca4a388efa6d