Merge "Fix GraphicsStatsValidationTest#testBasicDrawFrame" into pie-cts-dev