Merge "Revert "Leanback Support: Added support for rendering media items in a playlist"" into nyc-dev