Merge "Properly constrain leanback preference icon size" into mnc-ub-dev