Merge "Add inset options for Toolbar." into pi-car-dev