Merge "Leanback: fix late selection of BaseRowsFragment" into nyc-support-25.2-dev