am da90a9c2: Merge "Do not allow the navigation bar to move if width == height"

* commit 'da90a9c2355841bb98c2a669446b93ffe487a829':
  Do not allow the navigation bar to move if width == height