Merge "DO NOT MERGE: Fix GraphicsStatsValidationTest#testBasicDrawFrame" into pie-cts-dev