am 5cd8ccf4: am 8cb6d570: (-s ours) 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 '5cd8ccf41d07e4d9cb2ea65e251abadf758955d0':