Revert "NavbarHeight: remove unnecessary conditional."

stop fucking with the navbar.  my device requires it. yours does not.

This reverts commit 26cefb613e48ddd9aa6630038c320decf194cdc8.

Change-Id: Ieefbe1d5ba81462cc9f033057cd6607533b575d9