Merge "Make sure preserved surface is removed when it\'s no longer needed"...
Merge "Make sure preserved surface is removed when it\'s no longer needed" into nyc-dev am: 0a872f0b
am: 5c99f3a4
* commit '5c99f3a4':
Make sure preserved surface is removed when it's no longer needed
Change-Id: I65b9b588836f283eda56b196b7b15f0dd9fb73d5