Merge changes I6f21d272,Ic0f72593 into rvc-dev

* changes:
  SurfaceControlViewHost: Call die instead of dispatchDetached
  SurfaceView: Release SurfacePackage when done