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

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