Bug 1012407 - Follow-up nits for part 6.
Bug 1012407 - Part 7: Use a single GL draw call to draw up to 4 texture quads (r=Bas)