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