am d103d8b2: (-s ours) am f19c50fc: am aace94af: DO NOT MERGE. Fix problem where swiping upward in overflow menu did not display the correct options menu items.

* commit 'd103d8b2bf7f3334de83e870f6bf4c7ec95518e9':