Merge "Fix RecyclerView save instance state bug" into klp-modular-dev