Merge "Take children's margin in account in AppBarLayout" into lmp-mr1-ub-dev