Revert "Revert "Detect whether overflow button should be shown based on menu key state""

This reverts commit 60d43d4a7bb01f6a60fd5f521e3fa83c333d5800.
Re-add @Override