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: 4289fa1a
* commit '4289fa1a':
Make sure preserved surface is removed when it's no longer needed
Change-Id: Ic22ecd9e84c4f13c3ea2ad2dd8a45e47bbdf64c4