Revert "Show Navigation bar menu for every device now"

This reverts commit adb50fc0ff1e08113e8b6bf066bfcf57f9613fe3.

Change-Id: Ia09deedd44340ce64e0f5e3b455b28ccf2442191