Merge "Fix NPE when detached RecyclerView schedule onLayoutChildren()"