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

* commit '1cf161b0830594d6a14c5e8c297b6ceab69ad254':
  leanback: Fix selection offset when restoring gridview