Merge "Leanback: fix fading mask and make ImageCardView up to spec" into lmp-mr1-ub-dev