Merge "Fix problems creating graphics context."