am 0f067e4f: am d702f2b4: Merge "Properly constrain leanback preference icon size" into mnc-ub-dev

* commit '0f067e4f87d5e2583d503d2ebcab7393cc819cc5':
  Properly constrain leanback preference icon size