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