Merge "Update sample for RecyclerView" into klp-modular-dev