Merge "DO NOT MERGE leanback: fix row selection problems" into mnc-ub-dev