Fix navbar bad behavior when rotating to landscape

Change-Id: Ie6dc95cdcd2d725e42872cc5c6cabe455f3ac106