Merge "Fix some minor bugs with GL state setup that were exposed by Droids driver."