Merge "Fix dependency sorting in CoordinatorLayout" into mnc-ub-dev