Merge "RecyclerView focus search improvements" into nyc-dev