Merge "leanback: Improvement of Picker" into mnc-ub-dev