Enable navigation bar on all devices, (2/2)

Change-Id: I1273cdeba56bba5660b08a2cead3e9ee2335a818