Merge "SF: Fix incorrect early sf gl phase information dumped from SurfaceFlinger"