am 638a2a4a: Merge "Fix crash in CoordinatorLayout DO NOT MERGE" into mnc-dev

* commit '638a2a4a0b31b7d669bf0000dacd18129754d37c':
  Fix crash in CoordinatorLayout DO NOT MERGE