Merge "leanback: Fix selection offset when restoring gridview" into mnc-ub-dev