Clear layout pointer after deletion

This appearantly works around a double-deletion issue. Until the
real cause has been found, I commit this change based on a patch
by Raul Fernandes to 4.7 branch.

Thanks Raul for investigation and patch!

CCBUG: 275286