Merge "Leanback: Fix flaky tests"