Merge "Do not cut off top and bottom in landscape view." into nyc-dev
am: aaa459b7a9

* commit 'aaa459b7a9247e57275a6d80b19846a4fd6fa0a9':
  Do not cut off top and bottom in landscape view.

Change-Id: Ib700c24fc4131c573a8869ee53d2674b31f758a8