Merge "Leanback: Fix test" into mnc-ub-dev