Merge "surfaceflinger_fuzzer: Bug Fix" into main