Merge changes Iea02806d,I45af7b49,Id50e0d23

* changes:
  Revert "Bind to FBO when using GPU composition"
  Revert "Remove gl surfaces from DisplayDevice."
  Revert "Delete renderengine::Surface"