Merge changes I3009e1d1,I0b38de24 into nyc-support-24.1-dev

* changes:
  Fix BrowseFragmentTest
  leanback: fix NPE caused by late loading main fragment.