Merge "Leanback Support: ClassPresenterSelector now supports both Presenter and PresenterSelector" into nyc-dev