am bbf4c63c: 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 'bbf4c63c':
DO NOT MERGE. Fix problem where swiping upward in overflow menu did not display the correct options menu items.