Revert "Menu button location and menu force show"

This reverts commit 8b7cec9030abbf11dde82362a8a8f4be709c38a2.

Change-Id: I0717ee13b24ea66a9deeb6a992e416da496ea040