Merge "Fixed visibility of inactive columns in Leanback Picker widget" into nyc-support-25.2-dev
am: 330cb0338a

Change-Id: I333a29b5720004225a3ad76e0667996b0fcdea4d