Merge "RecyclerView Cleanup" into lmp-preview-dev