Merge "Apply final crop during surface preservation" into nyc-dev am: 2d4d408a5b
am: a409fada63
* commit 'a409fada63a49a959d54d642aaeafaef2ffdcc13':
Change-Id: Iad84d62eeac30b180a3987023011001a70b76943
This commit is contained in: