Merge "Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150" into honeycomb