Merge "Fix issue with leaked preserved surface" into pi-dev am: 682ca4122d
am: 2545afe577

Change-Id: Ibbd6d86cebc846ace677eaf15bdcdd7f37c8ebc3