Flo/Deb NavBar landscape fix [1/2]

Change-Id: I3ddcb993f82758bf2d7a183dcb8023b2fcb8f6c8