Merge changes Iead191ab,If35a0bb0

* changes:
  Wait for SurfaceAnimationThread before teardown
  Call end callback for custom rotation anim.