Merge "Fix layout positioning for Toolbar"