Merge "Fix bug with accelerated translucent rendering"