Merge "Fix (quick and dirty) of SurfaceFlinger HWC chips" into main