Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev am: 6b683ecf6e
am: 59595cdc53

Change-Id: I28e385ac6f1eea11d749aa52dfce1327717a1964