am 208eb3e8: Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev

* commit '208eb3e84a8ec3458b8cda7afd969e890261a018':
  Android TV DevGuide home fix (no pic)