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