Merge "fix libagl surface initialization"