Merge "SF: Introduce struct surfaceflinger::Config"