Merge "Revert RecyclerViewCaptureHelper changes from ag/15083160" into sc-dev