Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev