am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev

* commit 'b5d79bd2ab8b0382e05f38653ce0fbb56290ea58':
  Android TV Landing Page