Merge "Check for null surface pointer in renderOverdraw"