Merge "leanback: fix flaky test"