Merge "Fix RTL for leanback preference category" into nyc-dev