Merge changes Ie43e3cc8,Ie5aed430

* changes:
  Consolidate ViewRootImpl callbacks for SurfaceView
  Add surface changed callbacks to ViewRootImpl