am 6d013798: am f19c50fc: am aace94af: DO NOT MERGE. Fix problem where swiping upward in overflow menu did not display the correct options menu items.

* commit '6d01379857b5650b60fa1f9302afc3e519640ec4':
  DO NOT MERGE. Fix problem where swiping upward in overflow menu did not display the correct options menu items.