Merge "Fix RecyclerViewLayoutTest" into nyc-support-24.1-dev