Merge "Fix crash in CoordinatorLayout DO NOT MERGE" into mnc-dev