Merge "Fix Gfx buffer leak in cts EncodeVirtualDisplayWithCompositionTest"