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