Merge "Disable letterbox education during app compat flicker tests" into main