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

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