Merge "Leanback: use SingleRow for most widgets" into lmp-mr1-ub-dev