Merge "Only enable GL rendering on the main thread." into honeycomb