Merge "Switch mNestedRecyclerView to weakref" into nyc-support-25.1-dev
am: d816c7f186

Change-Id: I45faaf5e78db1127aaac109d9ac7775c35e97092