Merge "AppBarLayout" into lmp-mr1-ub-dev