Merge "RecyclerView Automatic WRAP_CONTENT support" into mnc-ub-dev