Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread