Merge "Revert "Fixed focus transfer for GridLayoutManager and Leanback picker widgets"" into nyc-support-25.2-dev