Merge "leanback: workaround RV focusSearch() issue." into nyc-dev