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

Change-Id: Icd502a24ae7502e4504e5341c9fd8f6da90cee67