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