Merge "Fix testStabilizationOneShotPreviewCallback" into pie-cts-dev