Merge "Fix CollapsingToolbarLayout with child margins"