Merge changes I4f93c4a6,I87f77cb6

* changes:
  SurfaceView: Don't reparent SurfacePackage on release
  SurfaceView: Synchronize add/remove SurfacePackage with VRI draw