am 7beb7d75: Merge "CoordinatorLayout bugfixes" into lmp-mr1-ub-dev

* commit '7beb7d758b5f3e4f40eccdbfec0f82e80436545b':
  CoordinatorLayout bugfixes