Merge "Adapt service checks for gfx and nogfx case"