Merge "leanback: fix NPE of transition listener and clean up" into mnc-ub-dev