Flo/Deb NavBar landscape fix [2/2]

Change-Id: I9468c997759e9471b087b27dfcaa876eb9ca2c1a