Merge "Fix icon margins for leanback preference items." into mnc-ub-dev