Merge "leanback: API tuning: inner classes" into mnc-ub-dev