Merge "Update app compat team alias in flicker tests" into main