Merge changes I2bb5d917,Ie91da3c7

* changes:
  Rename destroyInTransaction to destroyNotInTransaction.
  Ensure surfaces are reparented before destroying parent.