Merge "Fix RTL for leanback preference category" into mnc-ub-dev