Fix unsetting the shell surface on deletion

Change-Id: I700975ae4f1ef5156406e8b0d7655abf960aba06
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>