Merge "leanback: remove usage PersistentFocusWrapper" into nyc-support-25.4-dev