Merge change I81b1421a into eclair

* changes:
  Defer EGL init until the surface changed call comes in.  Pass w,h along with surface for verification of driver state.