Merge "leanback: fix flaky tests" into nyc-support-25.4-dev