Merge "Merge "Make sure preserved surface is removed when it\'s no longer...

Merge "Merge "Make sure preserved surface is removed when it\'s no longer needed" into nyc-dev am: 0a872f0b am: 5c99f3a4" into nyc-mr1-dev-plus-aosp
am: c38879e4

* commit 'c38879e4':
  Make sure preserved surface is removed when it's no longer needed

Change-Id: I7626eec6458ec72929b39da542b01b9782098dac