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