Merge "leanback: fix layout issue of wrap_content" into mnc-ub-dev