Merge "Revert "Revert "Use RecyclerView for NavigationView""" into mnc-ub-dev