Merge "Unit test for PipSurfaceTransactionHelper" into main