Better handling for legacy devices navbar

Patchset 2: whitespaces

Change-Id: Ifd5c9f298f3ddc8d52515a2714934498ff49cec8