Merge "CoordinatorLayout bugfixes" into lmp-mr1-ub-dev