Merge "Disable RecyclerView animation to fix the broken UI" into sc-dev